From: Jan Djärv <jan.h.d@swipnet.se>
Date: Tue, 19 Jan 2010 14:54:57 +0000 (+0100)
Subject: Merge from trunk
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1^2~5^2~844^2~5560^2~5
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=bc4b76f12a306f8fbc892e6f1e00733f3ef1981f;p=emacs.git

Merge from trunk
---

bc4b76f12a306f8fbc892e6f1e00733f3ef1981f